Revert "fix up travis LDFLAGS."

This reverts commit 8229a81fa41bcccb5db5e1ffba10c2975ee750ed.

diff --git a/.travis.yml b/.travis.yml
index 9e9a9d18e965af08708a30d44e64f88b8cafd03d..28f6819a72019b52cd23ddc7a35b0f19c047ce0f 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,7 +56,7 @@ install:
 
 script:
   - if [ "${USE_DOCKER}" = "true" ]; then ./docker_hook; fi
-  - if [ "${USE_DOCKER}" = "false" ]; then QMAKE=/opt/qt${QT_VERSION}/bin/qmake LUPDATE=/opt/qt${QT_VERSION}/bin/lupdate LRELEASE=/opt/qt${QT_VERSION}/bin/lrelease LDFLAGS="-Wl,-rpath,/opt/qt${QT_VERSION}/lib -L/opt/qt${QT_VERSION}/lib" ./build_and_test; fi
+  - if [ "${USE_DOCKER}" = "false" ]; then QMAKE=/opt/qt${QT_VERSION}/bin/qmake LUPDATE=/opt/qt${QT_VERSION}/bin/lupdate LRELEASE=/opt/qt${QT_VERSION}/bin/lrelease LDFLAGS=-Wl,-rpath,/opt/qt${QT_VERSION}/lib ./build_and_test; fi
 #   partially undo qt${QT_VERSION}-env.sh for linuxdeployqt based on https://github.com/probonopd/linuxd
 #  - unset QTDIR; unset LD_LIBRARY_PATH; unset PKG_CONFIG_PATH;
   - if [ "${USE_DOCKER}" = "false" ]; then export VERSION=$(git rev-parse --short HEAD); fi # linuxdeployqt uses this for naming the file